Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update image versions and replace the sample traces generator #4637

Merged
merged 5 commits into from
Aug 7, 2023

Conversation

wildum
Copy link
Contributor

@wildum wildum commented Jul 28, 2023

PR Description

This PR updates the docker compose example:

  • change image versions of grafana / tempo / loki to a recent version
  • replace the deprecated synthetic-load-generator (archived project) by hotrod to generate sample traces

PR Checklist

  • [NA] CHANGELOG updated
  • [NA] Documentation added
  • [NA] Tests updated

@wildum wildum requested a review from a team as a code owner July 28, 2023 15:08
@CLAassistant
Copy link

CLAassistant commented Jul 28, 2023

CLA assistant check
All committers have signed the CLA.

@thampiotr
Copy link
Contributor

I know this may be a stretch, but can you try replacing cortex with mimir image?
This is a migration guide if it helps... https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-cortex/

@thampiotr
Copy link
Contributor

I also think that this config should be uncommented by default - so that we have all 3 DBs working.

You can test Loki with a query like {job="varlogs"}.

@rfratto
Copy link
Member

rfratto commented Jul 31, 2023

@wildum The CLA is struggling because only the second commit in the PR is associated with your GitHub account; you'll need to squash it into one commit (or change the author of the first commit) so the CLA stops complaining.

@wildum wildum force-pushed the update-docker-compose-example branch from 08aa89b to ec00012 Compare August 7, 2023 11:52
@wildum wildum requested review from a team and clayton-cornell as code owners August 7, 2023 11:52
environment:
- TOPOLOGY_FILE=/etc/load-generator/load-generator.json
- JAEGER_COLLECTOR_URL=http://agent:14268
hotrod:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to dogfood xk6-client-tracing like the Tempo repo does.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't know about this one. Maybe we can leave this upgrade for another PR, because we've been creeping scope in this one for a bit already.

Comment on lines 43 to 47
server:
grpc_server_max_concurrent_streams: 1000
grpc_server_max_recv_msg_size: 104857600
grpc_server_max_send_msg_size: 104857600
http_listen_port: 9009
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can we order the sections in the same way as the original file? Will make review and git history easier to browse.

Copy link
Contributor

@thampiotr thampiotr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Nice work :)

@thampiotr thampiotr merged commit b5813d3 into main Aug 7, 2023
@thampiotr thampiotr deleted the update-docker-compose-example branch August 7, 2023 16:25
clayton-cornell added a commit that referenced this pull request Aug 14, 2023
* update image versions and replace the traces generator

* replace cortex by mimir and uncomment logs config

* flow: Add openstack discovery component (#4606)



Co-authored-by: Mischa Thompson <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>

* reorder config in mimir.yaml to match previous file

---------

Co-authored-by: Marc Tudurí <[email protected]>
Co-authored-by: Mischa Thompson <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
clayton-cornell added a commit that referenced this pull request Aug 14, 2023
* update image versions and replace the traces generator

* replace cortex by mimir and uncomment logs config

* flow: Add openstack discovery component (#4606)



Co-authored-by: Mischa Thompson <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>

* reorder config in mimir.yaml to match previous file

---------

Co-authored-by: Marc Tudurí <[email protected]>
Co-authored-by: Mischa Thompson <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 22, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants